merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 25 Aug 2010 04:06:15 +0000 (13:06 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 25 Aug 2010 04:06:15 +0000 (13:06 +0900)
commit2ddc5f7a02b2450cc6e3a454bb4092c5e8f36fc0
treea1fd71ef9bf5525747a2dd6fd32183a4aa876372
parent955c88bc8c7e9c28ef6e1ba63d6c711e166b974e
parent1bde17ee20adecd157741022abb461790d0bd6fb
merge trunk